From 4045cc1ac56627c36307eb425962cf1efae7cc4d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 20 Dec 2004 17:15:11 +0000 Subject: [PATCH] Pass a root path to gtk_tree_model_rows_reordered(). (#161720, Marcin 2004-12-20 Matthias Clasen * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): Pass a root path to gtk_tree_model_rows_reordered(). (#161720, Marcin Krzyzanowski) --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ gtk/gtkliststore.c | 13 +++++++------ 5 files changed, 23 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6b13ff30b1..f81b60be19 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2004-12-20 Matthias Clasen + * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): Pass a + root path to gtk_tree_model_rows_reordered(). (#161720, + Marcin Krzyzanowski) + * gtk/gtkactiongroup.c (gtk_action_group_translate_string): Don't translate NULL messages. (#161789, Morten Welinder) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6b13ff30b1..f81b60be19 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 2004-12-20 Matthias Clasen + * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): Pass a + root path to gtk_tree_model_rows_reordered(). (#161720, + Marcin Krzyzanowski) + * gtk/gtkactiongroup.c (gtk_action_group_translate_string): Don't translate NULL messages. (#161789, Morten Welinder) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 6b13ff30b1..f81b60be19 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,9 @@ 2004-12-20 Matthias Clasen + * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): Pass a + root path to gtk_tree_model_rows_reordered(). (#161720, + Marcin Krzyzanowski) + * gtk/gtkactiongroup.c (gtk_action_group_translate_string): Don't translate NULL messages. (#161789, Morten Welinder) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6b13ff30b1..f81b60be19 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,9 @@ 2004-12-20 Matthias Clasen + * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): Pass a + root path to gtk_tree_model_rows_reordered(). (#161720, + Marcin Krzyzanowski) + * gtk/gtkactiongroup.c (gtk_action_group_translate_string): Don't translate NULL messages. (#161789, Morten Welinder) diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c index 29ed16ea92..8ef1489a1a 100644 --- a/gtk/gtkliststore.c +++ b/gtk/gtkliststore.c @@ -1716,10 +1716,11 @@ gtk_list_store_sort_iter_changed (GtkListStore *list_store, gint column) { - GtkTreePath *tmp_path; + GtkTreePath *path; - tmp_path = gtk_tree_model_get_path (GTK_TREE_MODEL (list_store), iter); - gtk_tree_model_row_changed (GTK_TREE_MODEL (list_store), tmp_path, iter); + path = gtk_tree_model_get_path (GTK_TREE_MODEL (list_store), iter); + gtk_tree_model_row_changed (GTK_TREE_MODEL (list_store), path, iter); + gtk_tree_path_free (path); if (!iter_is_sorted (list_store, iter)) { @@ -1731,12 +1732,12 @@ gtk_list_store_sort_iter_changed (GtkListStore *list_store, gtk_list_store_compare_func, list_store); order = generate_order (list_store->seq, old_positions); + path = gtk_tree_path_new (); gtk_tree_model_rows_reordered (GTK_TREE_MODEL (list_store), - tmp_path, NULL, order); + path, NULL, order); + gtk_tree_path_free (path); g_free (order); } - - gtk_tree_path_free (tmp_path); } static gboolean -- 2.30.2